Fix code, rename file