Merge "Switch to standard naming scheme"