Merge "Rename file because gradle doesn't like camelCase." into rvc-dev