Renames CommandPayloadConfig to CommandPayload. Minor refactorings