Rename file and add more constants