Fix names
Don't assert source/target in kwargs