Rename and polish

Rename and polish