[FIX] Name change + minor changes