Fix name_space of var for data retrieved from storage. 'yes it was stupid'