And another naming fix