Clean up single key page feature and change key names