cleaned up some naming issues
renamed to have file name consistency
renamed to have file name consistency