Moved naming convention to packages