Pushing Problem 5, and some renaming