package/file naming inconsistencies