naming checked and fixed