Changed the naming structure.