Some naming fixes for consistency's sake