Fixes up some nomenclature stuff and cleans up monicker formatting