Reverted doc and test names back to original