Make sure renames in client modules are properly qualified