Correct naming and fix inits