Modify configuration name conventions 

Please review and merge