change name case here as well