Fixed nomenclature and storage code