Added the correct classnames instead of the file names for discovery