closes #11 - naming updated