updated main to reflect changed names