Merge "Switch to standard naming scheme" into rvc-dev