More naming convention adherence improvements.