Update names to work with previous implementation