Simpler naming conventions and correcting defaults in conf.py