Update in lovetoys, renaming functions