Complete cleanup, consistent error naming