More updates after rename