changed layout resources id's camel case