fixes for name-changes