cleanup and name changes