Merge "Change the child classes methods names to align with parent's"