ApiCLI: normalizeClassName, more fixes