Switch field design and fix en file naming