server & client: Some lint validation renames