did some renaming to make framework more understandable