Capabilities name refactoring.