Generarl Name Refactoring
Cleanup and update description