fixing some names after refactor