made several naming changes