removing old naming references for dotcloud and AWS