Properly preserve names of controls
Add tests for names of controls