Removed double code

- Renamed array wrappers and added a fourth array wrapper