clean up to use original name and fix warnings