[SKYCC-3][BUG]: Updated all internal functions reference bugs