Added replacement of classnames for field declarations.