Update methods names according to PEPS document