Update variable names, remove Compass