Finished nomenclature changes, removed moderation topic