starting renaming of directive attributes
variable renaming and cleanup