Some cleanup on name prefix
Cleanup README.