update more naming issues