A few more extension methods renamed