Naming, small fixes