Fixing method header names (this is not java :p)