Fixes two misnaming

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
Fixes ill-advised refactoring

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>