Updated makefile and file naming scheme post-upgrade