Minor changes: using lower case naming convention, added some missing configurations.