Changed some naming schemes
Changed some naming schemes