Changed class name and others according to the comments by Lars