Use correct file name convention
Clarifications and improvements