Rename functions files and loosen class matching