fix issue caused by naming