More refactoring work on potion and recipe systems. Renamed more classes to follow Name<Function> scheme.