Reworked whole skill to fix the new naming system