REF: Changed file names for new coding style