File names to follow a more elegant convention