Functions and class naming changed