merge common options; rename things
src: catch up with renaming
update makefile