Small error changes

No major problems, just naming updates