rename
Fixed references and added coommand task