Class naming changed