Nomenclature fixed. Not finished.