Cleaned up sample class names and implementations.