Bubblefish

Made naming convetion the same across all files.