Clean up a bit more

Again, few cosmetic changes regarding methods names.