Relocating and renaming Secret Code and Service Name fields.