more consistency in conventions
bugz