Fixed file naming conventions