development: Minor fixes to naming to reflect swift version