Merge "Comply with naming convention in RFC6335." into rvc-dev