cleaned up naming and configuration parameters