Change naming schemes and polish details