Add more filename variations for testing
Rename only when needed and update feature spec.