fix naming schemes