Fix updated name reference / make errors