Some name changes, seems to have worked