Fixed content name system (still needs testings)