Merge "Get rid of legacy ref_ prefixes in configuration"