Rename, add documentation, test