Converted return types to their complementary interfaces, if any.

Signed-off-by: Dimitar Dobrev <dpldobrev@yahoo.com>