Fixing funciton names