fixed gapcloser dependency issues, fixed renaming bug