added Code names + code IND test/fix