Rewrite for new naming rules; change arg order