Fixes some naming