Bugfix Layout / naming of directiv