Upgrade to use Swift conventions