Fix typo
Move remappings down