Don't use thin
Convert mapping classes
Make sure acronym is available
Fix mappings tests