Removed trailing underscores from types