fix code and rename