Promise api improvements : mostly renaming things a bit