First pass at name changes and removal of un-needed parts from Progress10