Fixed classes name calculations.