Fix name table. Add cascde