cleaner naming conventions and cleaner servername outputs