map scheme
fix renames