Git: Rename couple methods in WrapManager.
Git: Use typedef's while defining Wraps.