Schmea changes to better support names