Minor naming and style fixes for User new