more renames
fix for tests