Fix some overlay camel-case usages I missed