Fixed naming issue for j1.8.
Refactored and renamed Bufferable.