Rename, reorder & fix hardcoded strings