adjust #defines to include class name