rename file and fix broken functionality