Some final changes around naming