Add role prefix to role specifig variable to avoid conflicts when
using multiples role on the same machine on the same play.

And minor improvements/refactoring