Almost naming fixes, added some consts