Sanity file naming

Let's keep file names etc consistent