Appropriate small structure and name library modifications related to the MpdFemto package in the previous commits.