Fixed naming and initialization.