Rename for better integration