refactored away old naming schemes