cleanup
updated interfaces for renaming