Better naming conventions for methods (unreverted, after merging with Vaendryl)