Making naming schemes consistent