Conformed file names

v0.8