Fix/rename issues to work packages