Changed naming convention and removed explicit include to be used in profiles.