changing to non-generic program names