Bug: Repeated method with same names

Partially fixed, still have to deal with a highlighting problems.