Prefix adjustments

Removed prefix and moved to function names