Naming fixes, tests doesn't work right yet