Rename map to just map