Fix attributes mis-naming