cleaned up default attribute naming